ScreenShield: remove curtain animation when hiding without animation

If we don't remove the animation, we might leave a pending call
to _lockScreenShown() which would confuse our state tracking into
thinking we're active when we're not.

https://bugzilla.gnome.org/show_bug.cgi?id=700901

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 990f18ffb252de5578fb2a05a48e43ff9d4a88e5..ffe87624624a7ce2094d38aa414f2c426d36b3b9 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -882,6 +882,8 @@ const ScreenShield = new Lang.Class({
 
         this._lockScreenState = MessageTray.State.HIDING;
 
+        Tweener.removeTweens(this._lockScreenGroup);
+
         if (animate) {
             // Tween the lock screen out of screen
             // if velocity is not specified (i.e. we come here from pressing ESC),
@@ -894,7 +896,6 @@ const ScreenShield = new Lang.Class({
             velocity = Math.max(min_velocity, velocity);
             let time = (delta / velocity) / 1000;
 
-            Tweener.removeTweens(this._lockScreenGroup);
             Tweener.addTween(this._lockScreenGroup,
                              { y: -h,
                                time: time,